Merge branch 'master.experimental'

Signed-off-by: Matteo F. Vescovi <mfv.debian@gmail.com>
Git-Dch: Ignore

diff --cc debian/changelog
index ab5e63187ba4014707cdb94c7e123c58d0050b83,f08a043a4f45dfa6c4e0b5984bfcf72c66e20447..211cfc71edcd8a1cbf3cdfe9280f8f2b3025d1b7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,17 +1,32 @@@
+ babl (0.1.6-1) UNRELEASED; urgency=low
+ 
+   * Initial "0.1.x series" release (Closes: #541170)
+     + debian/source/format: config file added
+     + debian/rules: .la files removal added
+     + debian/watch: config file added
+     + doc-base config file added
+     + debian/compat: bump version to 8
+     + debian/copyright: cleaning old dh_make stuff
+     + debian/control: maintainer, homepage and VCS links updated
+     + debian/*.symbols: file added
+ 
+  -- Matteo F. Vescovi <mfv.debian@gmail.com>  Thu, 19 Jan 2012 11:21:20 +0100
+ 
 +babl (0.0.22-2) unstable; urgency=low
 +
 +  * debian/control: maintainer changed
 +  * debian/control: debug package added (Closes: #503674)
 +  * debian/control: dbg's Priority field set
 +  * debian/watch: config file added
 +  * debian/control: bump Standards-Version to 3.9.2
 +  * debian/: bump debhelper support to 8 and compliance
 +  * Acknowledgement for 0.0.22-1.1 NMU (Thanks Gregor!)
 +  * babl/babl-model.c: upstream file restored
 +  * debian/patches/: providing patching infrastructure
 +  * debian/source/: providing 3.0 (quilt) support
 +
 + -- Matteo F. Vescovi <mfv.debian@gmail.com>  Tue, 07 Feb 2012 14:56:25 +0100
 +
  babl (0.0.22-1.1) unstable; urgency=low
  
    * Non-maintainer upload.

diff --cc debian/control
index 8e61d3f27b9f3d06ed6d064326b7dee3932d0869,e4eb5a4df1306ccd59ce449e727dea308fd6eaa0..3b75b65a80ce007182970b19e4849fecc15fe28a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -15,10 -17,10 +17,10 @@@ Description: Dynamic, any to any, pixe
   stored in. Babl doesn't only help with existing pixel formats, but
   also facilitates creation of new and uncommon ones.
  
- Package: libbabl-0.0-0-dev
 -Package: libbabl-0.1-0-dev
++Package: libbabl-0.1-dev
  Architecture: any
  Section: libdevel
- Depends: ${misc:Depends}, libbabl-0.0-0 (= ${binary:Version})
+ Depends: ${misc:Depends}, libbabl-0.1-0 (= ${binary:Version})
  Description: Dynamic, any to any, pixel format conversion library (development files)
   Babl is a dynamic, any to any, pixel format conversion library. It
   provides conversions between the myriad of buffer types images can be
@@@ -38,17 -40,3 +40,17 @@@ Description: Dynamic, any to any, pixe
   also facilitates creation of new and uncommon ones.
   .
   This package contains the API documentation.
- Package: libbabl-0.0-0-dbg
 +
++Package: libbabl-0.1-dbg
 +Section: debug
 +Priority: extra
 +Architecture: any
 +Depends: libbabl-0.0-0 (= ${binary:Version}),
 +         ${misc:Depends}
 +Description: Dynamic, any to any, pixel format conversion library (debugging symbols)
 + Babl is a dynamic, any to any, pixel format conversion library. It
 + provides conversions between the myriad of buffer types images can be
 + stored in. Babl doesn't only help with existing pixel formats, but
 + also facilitates creation of new and uncommon ones.
 + .
 + This package contains the debugging symbols.

diff --cc debian/copyright
index 17f0a48f7fdfd48bd047a0a1cdace5d7420bd40a,802b26b409d2a04a705c819d6b2b84151053e97a..2b5756c79b2ce78fe1f4f56958d004d5545a44b6
--- 1/debian/copyright
--- 2/debian/copyright
+++ b/debian/copyright
@@@ -22,9 -21,9 +21,9 @@@ License
    You should have received a copy of the GNU Lesser General Public License along
    with this library; if not, write to the Free Software Foundation, Inc., 51
    Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- 
+ Comment:
  On Debian GNU/Linux systems, the complete text of the GNU Lesser General Public
 -License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 -.
 +License can be found in `/usr/share/common-licenses/LGPL-3'.
 +
  The Debian packaging is 2007, Étienne Bersac <bersace03@laposte.net> and
 -is licensed under the GPL, see `/usr/share/common-licenses/GPL-2+'.
 +is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'.

diff --cc debian/libbabl-0.1-0-dev.install
index 0000000000000000000000000000000000000000,625887eb79fb9633453ac9b7be17bbddc3ede215..4628b2251b98dfae29cc64d254073aac34966077
mode 000000,100644..100644
--- /dev/null
--- 2/debian/libbabl-0.1-0-dev.install
+++ b/debian/libbabl-0.1-0-dev.install
@@@ -1,0 -1,3 +1,3 @@@
 -debian/tmp/usr/include/
 -debian/tmp/usr/lib/libbabl*.so
 -debian/tmp/usr/lib/pkgconfig/
++usr/include/
++usr/lib/libbabl*.so
++usr/lib/pkgconfig/

diff --cc debian/libbabl-0.1-0.install
index 0000000000000000000000000000000000000000,2aa27671761e226357b49342b0c57f908035df7b..a2646a6405186bb6a50303f898e37afe8382149b
mode 000000,100644..100644
--- /dev/null
--- 2/debian/libbabl-0.1-0.install
+++ b/debian/libbabl-0.1-0.install
@@@ -1,0 -1,2 +1,2 @@@
 -debian/tmp/usr/lib/babl-*/
 -debian/tmp/usr/lib/libbabl*.so.*
++usr/lib/babl-*/
++usr/lib/libbabl*.so.*